Compatibility with camptocamp/systemd 3.x #886
Conversation
See voxpupuli/puppet-systemd@2.12.0...3.0.0#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R224-R229 `systemd::systemctl::daemon_reload` was removed.
There was a problem hiding this comment.
The daemon reload is needed on Puppet < 6.1.0 which according to metadata.json is still supported. That means this patch will break those systems.
I think the best way is to change the conditional to if defined(Class['systemd::systemctl::daemon_reload']). Due to the inclusion of systemd::service_limits in rabbitmq::config it should be guaranteed to be loaded and the best way to support both camptocamp/systemd < 3 and >= 3.
Then it should also allow version 3.x in metadata.json.
systemd::systemctl::daemon_reload was removed in camptocamp-systemd 3.0.0
|
The fainling test on puppet 7 debian 8 is not from the changes: |
|
I think we can ignore that failure on merge. A separate PR to drop Debian 8 would be fine for me. |
Ah right debian 8 is gone for some time already. I will prepare a PR |
|
I don't use RabbitMQ myself, I just reasoned from my Puppet knowledge. I also made a suggestion for the current implementation so perhaps it's good if someone else also took a look. If nobody does and you can verify this solves your problem then I don't mind merging it myself. |
|
If we’re already cutting a breaking release, what about doing #885? |
|
I'd be ok with that. |
|
May as well ship this one with 11.1.0 as well, and then merge #885 as part of the breaking release. |
- Add support for oom_score_adj (voxpupuli#877) - CLI Environment Fixes (voxpupuli#876) - make sure the rabbitmq_version method actually returns the version (voxpupuli#874) - Use mocked facts in tests (voxpupuli#873) - Enable Puppet 7 support (voxpupuli#881) - Add auto cluster configuration support (voxpupuli#883) - Compatibility with camptocamp/systemd 3.x (voxpupuli#886)
- Add support for oom_score_adj (voxpupuli#877) - CLI Environment Fixes (voxpupuli#876) - make sure the rabbitmq_version method actually returns the version (voxpupuli#874) - Use mocked facts in tests (voxpupuli#873) - Enable Puppet 7 support (voxpupuli#881) - Add auto cluster configuration support (voxpupuli#883) - Compatibility with camptocamp/systemd 3.x (voxpupuli#886) - puppetlabs/apt: Allow 8.x (voxpupuli#884) - puppet/archive: Allow 5.x (voxpupuli#884) - puppetlabs/stdlib: allow 7.x (voxpupuli#884)
* call systemd::systemctl::daemon_reload only if it is defined systemd::systemctl::daemon_reload was removed in camptocamp-systemd 3.0.0 (Also change to use puppet systemd module) (cherry picked from commit 0514e4a) Change-Id: I33c75bbf8967d4461c0037215d2cacacf9b8788a
* call systemd::systemctl::daemon_reload only if it is defined systemd::systemctl::daemon_reload was removed in camptocamp-systemd 3.0.0 (Also change to use puppet systemd module) (cherry picked from commit 0514e4a) Change-Id: I33c75bbf8967d4461c0037215d2cacacf9b8788a
Pull Request (PR) description
Remove
systemd::systemctl::daemon_reloadThis Pull Request (PR) fixes the following issues
Fails with puppet-systemd >= 3.0.0
See voxpupuli/puppet-systemd@2.12.0...3.0.0#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R224-R229
systemd::systemctl::daemon_reloadwas removed.@ekohl